fix: addonly EDITS should be handled as COMPLETIONS #2133

Will-ShaoHua · 2025-08-15T22:32:19Z

…

Problem

Solution

related pr aws/aws-toolkit-vscode#7646

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

…uggestion instead of Edits

codecov-commenter · 2025-08-15T22:36:23Z

Codecov Report

❌ Patch coverage is 58.36910% with 97 lines in your changes missing coverage. Please review.
✅ Project coverage is 61.29%. Comparing base (ed8c6dd) to head (35ee185).

Files with missing lines	Patch %	Lines
...nguage-server/inline-completion/utils/diffUtils.ts	66.50%	67 Missing and 1 partial ⚠️
...p-codewhisperer/src/shared/codeWhispererService.ts	0.00%	19 Missing ⚠️
...inline-completion/handler/editCompletionHandler.ts	9.09%	10 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2133      +/-   ##
==========================================
+ Coverage   61.24%   61.29%   +0.05%     
==========================================
  Files         261      261              
  Lines       58291    58504     +213     
  Branches     3582     3618      +36     
==========================================
+ Hits        35699    35860     +161     
- Misses      22524    22575      +51     
- Partials       68       69       +1

Flag	Coverage Δ
unittests	`61.29% <58.36%> (+0.05%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

atonaamz · 2025-10-02T00:14:21Z

server/aws-lsp-codewhisperer/src/language-server/inline-completion/utils/diffUtils.ts

+        if (line.startsWith('+')) {
+            completionSuggestion += line.substring(1) + '\n'
+            isInAdditionBlock = true
+        } else if (isInAdditionBlock && line.startsWith(' ')) {


Why do we add this check? Should the addition only contain lines with + at the beginning?

i updated this part of code, it should be

if (line.startsWith('+')) { completionSuggestion += line.substring(1) + '\n' isInAdditionBlock = true } else if (isInAdditionBlock && !line.startsWith('+')) { // End of addition block isInAdditionBlock = false }

atonaamz · 2025-10-02T00:14:26Z

server/aws-lsp-codewhisperer/src/language-server/inline-completion/utils/diffUtils.ts

+         *
+         **/
+        // TODO: should refine the logic here more, possibly find the first non-empty minus/plus if possible
+        if (firstMinusIndex + 1 === firstPlusIndex) {


what if there are insertion on multiple consecutive lines (like - - + +)? Will it be counted as edit or completion?

atonaamz · 2025-10-02T00:15:54Z

server/aws-lsp-codewhisperer/src/language-server/inline-completion/utils/diffUtils.ts

+        }
+
+        if (firstMinusIndex === -1 && firstPlusIndex !== -1) {
+            return 'addOnly'


will the + line always be after cursor position?

it's parsing the raw unified diff so cursor position here is not relevant. Cursor position will only be critical after we are sure if it's a COMPLETION and should we render it or not.

atonaamz · 2025-10-02T00:16:02Z

server/aws-lsp-codewhisperer/src/language-server/inline-completion/utils/diffUtils.ts

+        const relevantLines = d.linesWithoutHeaders
+
+        if (firstMinusIndex === -1 && firstPlusIndex === -1) {
+            return 'edit'


Is it possible that there are no + and - lines?

theoretically no, we do this way beause currently all suggestions coming back from Qwen is "EDITS" so we can safely assume they are EDTIS and let clients to decide if we will render it or not, i.e. delegate the resposibility to the 3rd party unidfied diff lib we are using in vscode.

atonaamz · 2025-10-02T00:16:08Z

server/aws-lsp-codewhisperer/src/language-server/inline-completion/utils/diffUtils.ts

+): { suggestionContent: string; type: SuggestionType } {
+    const diffCategory = categorizeUnifieddiff(unifiedDiff)
+    if (diffCategory === 'addOnly') {
+        const udiff = readUdiff(unifiedDiff)


can we just call this method one time and pass it to categorizeUnifieddiff?

bywang56 · 2025-10-02T01:13:45Z

server/aws-lsp-codewhisperer/src/language-server/inline-completion/utils/diffUtils.ts

+): { suggestionContent: string; type: SuggestionType } {
+    const diffCategory = categorizeUnifieddiff(unifiedDiff)
+    if (diffCategory === 'addOnly') {
+        const udiff = readUdiff(unifiedDiff)


where do we use this udiff?

yep you are right, it's not used here, removed.

bywang56 · 2025-10-02T01:14:39Z

server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts

            }
        }

+        // Backward compatibility, completions will be returned if predictinoType is not specified (either Completion or Edit)


nit, predictionType

bywang56 · 2025-10-02T01:20:41Z

server/aws-lsp-codewhisperer/src/language-server/inline-completion/utils/diffUtils.ts

+}
+
+// TODO: current implementation here assumes service only return 1 chunk of edits (consecutive lines) and hacky
+export function extractAdditions(unifiedDiff: string): string {


Few questions
The function stops processing when it hits a context line after additions right?

What happens with separated addition blocks in the same diff?

Do we handle multi-hunk diffs correctly?

Should we extract ALL '+' lines regardless of context interruptions?

yes it's based on the assumption service doesn't return multi chunk of edits

no

i assume this is also for the "multi-hunk" scenarios and no we dont handle it now

at the very least, we need to add if "multi-hunk" then EDITS

but i will take it as follow up as service currently doesn't return such suggestion (multi hunk)

* fix: patch #2133 and handle more variants of FIM suggestions * fix: only consider FIM if the first edit line matches trigger position * fix: test --------- Co-authored-by: atontb <[email protected]>

fix: pure addition edit suggestion should be treated as Completions s…

d80850f

…uggestion instead of Edits

Will-ShaoHua requested a review from a team as a code owner August 15, 2025 22:32

Will-ShaoHua changed the title ~~fix: pure addition edit suggestion should be treated as Completions s…~~ fix: pure addition edit suggestion should be treated as Completions suggestion instead of Edits Aug 15, 2025

Will-ShaoHua added 5 commits August 15, 2025 15:37

fix: patch

3b8d6bc

fix: patch

cd55b8e

fix: patch

ad543e1

fix: patch

0d085ae

Merge remote-tracking branch 'upstream/main' into fix

66480a3

Will-ShaoHua marked this pull request as draft August 18, 2025 21:23

Will-ShaoHua added 4 commits September 28, 2025 20:51

Merge remote-tracking branch 'upstream/main' into fix

ed467f9

fix: wip

97e7c10

fix: wip

058164b

fix: fix 1 case

fc7d505

Will-ShaoHua changed the title ~~fix: pure addition edit suggestion should be treated as Completions suggestion instead of Edits~~ fix: addonly EDITS should be handled as COMPLETIONS Sep 30, 2025

fix: a

d72d327

Will-ShaoHua mentioned this pull request Sep 30, 2025

fix(amazonq): nep only dev build aws/aws-toolkit-vscode#7646

Draft

Will-ShaoHua added 9 commits September 30, 2025 05:20

fix: comment

c96f8f1

fix: comment

9ae6045

fix: cleanup test

5983592

fix: cleanup

692b92b

fix: rename

2404748

fix: cleanup

bee02b5

Merge remote-tracking branch 'upstream/main' into fix

63ae62e

fix: file move

f206479

fix: file move

51b8278

Will-ShaoHua marked this pull request as ready for review October 1, 2025 23:19

atonaamz reviewed Oct 2, 2025

View reviewed changes

bywang56 reviewed Oct 2, 2025

View reviewed changes

Will-ShaoHua changed the base branch from main to feature/nep October 2, 2025 17:12

Will-ShaoHua added 2 commits October 2, 2025 13:41

Merge remote-tracking branch 'upstream/main' into fix

035fc04

Merge remote-tracking branch 'upstream/main' into fix

a1602c2

Will-ShaoHua changed the base branch from feature/nep to main October 2, 2025 20:49

Will-ShaoHua added 10 commits October 2, 2025 13:50

fix: asd

d67d784

fix: imporve

11942e9

fix: patch

178faea

fix: add test

aa26de4

Merge remote-tracking branch 'upstream/main' into fix

8a7c019

fix: patch

a1a241f

fix: test

92c25f2

fix: t

c64ea41

fix: t

175a9b0

fix: t

c3918f3

Will-ShaoHua requested review from atonaamz and bywang56 October 7, 2025 01:34

fix: comment

35ee185

bywang56 approved these changes Oct 7, 2025

View reviewed changes

atonaamz approved these changes Oct 7, 2025

View reviewed changes

Will-ShaoHua merged commit 4f5a9da into aws:main Oct 7, 2025
6 checks passed

Will-ShaoHua deleted the fix branch October 7, 2025 16:44

github-actions bot mentioned this pull request Oct 6, 2025

chore(release): release packages from branch main #2384

Merged

Will-ShaoHua added a commit to Will-ShaoHua/language-servers that referenced this pull request Oct 8, 2025

fix: aws#2133

4b2c993

Will-ShaoHua added a commit to Will-ShaoHua/language-servers that referenced this pull request Oct 8, 2025

fix: patch aws#2133 and handle more variants of FIM suggestions

75ab0bd

fix: addonly EDITS should be handled as COMPLETIONS #2133

fix: addonly EDITS should be handled as COMPLETIONS #2133

Uh oh!

Conversation

Will-ShaoHua commented Aug 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

License

Uh oh!

codecov-commenter commented Aug 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

atonaamz Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Will-ShaoHua commented Aug 15, 2025 •

edited

Loading

codecov-commenter commented Aug 15, 2025 •

edited

Loading

atonaamz Oct 2, 2025 •

edited

Loading